d/p/libostree.sym-Fix-test-symbols.patch: apply patch from upstream to fix a build...

diff --git a/debian/changelog b/debian/changelog
index e32bad854ceb824bf81fe1659e1992ace7b86d24..0d66baf5551a73a4f1b500ab5f34d0d4a18d3efa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ostree (2016.6-1) UNRELEASED; urgency=medium
   * d/gbp.conf: configure to use upstream/latest for upstream imports
   * d/gbp.conf: configure to merge upstream tags into upstream/latest
     (add https://github.com/ostreedev/ostree as a remote)
+  * d/p/libostree.sym-Fix-test-symbols.patch: apply patch from upstream
+    to fix a build-time test
 
  -- Simon McVittie <smcv@debian.org>  Wed, 15 Jun 2016 14:05:53 -0400
 

diff --git a/debian/patches/libostree.sym-Fix-test-symbols.patch b/debian/patches/libostree.sym-Fix-test-symbols.patch
new file mode 100644 (file)
index 0000000..cadbbbe
--- /dev/null
+++ b/debian/patches/libostree.sym-Fix-test-symbols.patch
@@ -0,0 +1,25 @@
+From: Colin Walters <walters@verbum.org>
+Date: Mon, 20 Jun 2016 18:13:58 -0400
+Subject: libostree.sym: Fix test-symbols
+
+The test isn't smart enough to ignore comments, so change the prefix.
+
+Closes: #356
+Approved by: jlebon
+Origin: upstream, 2016.7, commit:0134c621575fcb43bb9d994251831845dac8dbd1
+---
+ src/libostree/libostree.sym | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libostree/libostree.sym b/src/libostree/libostree.sym
+index e8cca9d..087f987 100644
+--- a/src/libostree/libostree.sym
++++ b/src/libostree/libostree.sym
+@@ -350,6 +350,6 @@ global:
+ /*
+ LIBOSTREE_2016.7 {
+ global:
+-        ostree_some_new_symbol;
++        someostree_some_new_symbol;
+ } LIBOSTREE_2016.6;
+ */

diff --git a/debian/patches/series b/debian/patches/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a185cd6c3513787b4b504886c13a321b35f3ad41 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+libostree.sym-Fix-test-symbols.patch